]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
screenshot: Use meta_window_has_pointer () for pointer check
authorIvan Molodetskikh <yalterz@gmail.com>
Mon, 20 Mar 2023 18:49:24 +0000 (11:49 -0700)
committerMarge Bot <marge-bot@gnome.org>
Tue, 21 Mar 2023 00:05:39 +0000 (00:05 +0000)
https://gitlab.gnome.org/GNOME/mutter/-/commit/909616b20876478bc56932cd18c8e85e982645f6 seems to have wrapped window actors in a container, so the actor.has_pointer check started failing. Instead, switch to meta_window_has_pointer () which doesn't rely on window actor implementation details.

We check for existence of has_pointer first just in case someone attempts to run gnome-shell 44.1 with mutter 44.0 which does not have the function exported publicly yet.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2710>

js/ui/screenshot.js

index fd84a74f8b72cc5afd2bf69e0131a942b843982f..59c63c71e16a34d7c226c499c87a66d79f2a52e7 100644 (file)
@@ -787,7 +787,7 @@ class UIWindowSelectorWindow extends St.Button {
 
         this._cursor = null;
         this._cursorPoint = { x: 0, y: 0 };
-        this._shouldShowCursor = actor.get_children().some(c => c.has_pointer);
+        this._shouldShowCursor = window.has_pointer && window.has_pointer();
 
         this.connect('destroy', this._onDestroy.bind(this));
     }